Merge with xen-ia64-unstable.hg
authorKeir Fraser <keir@xensource.com>
Tue, 24 Apr 2007 20:39:23 +0000 (21:39 +0100)
committerKeir Fraser <keir@xensource.com>
Tue, 24 Apr 2007 20:39:23 +0000 (21:39 +0100)

Trivial merge